Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 21:44:09 +0000 (14:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 21:44:09 +0000 (14:44 -0700)
commitaa34e492e8542e9d90e40d76b86fcfd70c9fc8b9
treef34ff895b223b8494932a0009e7246b3bc89c251
parent11aeb821bae0ff7b0dae04599e135bd816d97e73
parent1e5ef222799df5c081691c90e6c0ddeb7a096556
Merge from trunk.